1.x fixes for CodeMotion2