fixes to 9