Improved hotfixes