Fix some non-validating stuff, 404 page brokenness