Fixed a few critical bugs in compose2