Prepare for 1.6