fixes for 3.3