Fixed compilation errors originating from a previous merge