fixes to 7