404 improvements