Yet another set of fixes