Prepare for 1.2