Refactoring, 404 fixes