Fix bugs in Compose