Some quick upgrades