final fixes for PR1.3