1.x some fixes for codeMotion2