Bugfixes on compose