Squashes a couple of bugs on the 404 page