Fixed remaining 404 errors identified in #1635