Various fixes and upgrades.