merging 404 fixes

404 fix merge