Fixed up some transform bugs