Fixes the last things for IPB 3