Improved hotfixes
Merged