Modified a few hot fixes
Merge branch 'hotFix' of github.com:kristofvl/HedgeHog into hotFix