A few upgrades