final fixes for push