Prepare for r0.96