Correct compilation bugs