Fixing the 404 issues