Upgrade bugfixes