final fixes for 3.0.3