Added some quick fixes for transforms