minor fixes to 6