Hot fixes for nonexistant pages