Fixed bugs related to 'if' and 'compose' bindings