Further progress towards 4.2 compat