fixes to previous