Fixed compilation faults