Fixed patches for 3.3.0