Correct compilation issues