McLaren told to modify controversial rear wing as Ferrari admit 'frustration'