fix gcc and derp of cm