Fixing minor bugs when working with EmoComposer