add fixes to do