minor performance upgrades