fixes for 3.3.0.GA