Updates to 404 handling