Yet another set of fixes/upgrades