Fixed compilation changes