Fixed some transform-based mistakes