Various fixes
Merge pull request #749 from DraculeMihawk/patch-17

Various fixes