Slight upgrades