Misc fixes
Tuned hotfix tool a bit