Website loading

A few fixes for #2286.