Fixes and minor upgrades.