Fixes to 404 and 500 pages