Minor improvements and upgrades.