Some fixes as pages didn't build on GH.