Skip to content

Make misc fixes

Make misc fixes #887