Additional 404 improvements.