Slowly progress towards 1.6 support