C2: applied changes for C2 compiler