Added few more transformation fixes