Fix translation
Fix rotation-scale interaction