[compiler/c] Squash, some fixes