DEVELOPER-410 Fixed several 404s