Fixes for 404 errors