Fixing 404 issues