round 2 of fixes