WIP: Fix composite transform classes and some other bugs

Change-Id: Ib32f2f289c726f793b2a7876b6698a958095645e