Fixed compilation errors in previous commit