1.5.x formatting fixes