Fixed compilation issues with Phase III