Minor fixes
Merge pull request #740 from DraculeMihawk/patch-13

Minor fixes