Prepare for 3.5