More preparing for 1.6