Additional fixes for js transform