minor fixes - RELEASE CANDIDATE JULY1