another set of fixes