Upgrades for better kernel operations