few fixes to do all