Minor fixes
Merge pull request #1 from izx64/patch-1

Minor fixes