Add missing remaps