FIX: Minor fixes
Merge pull request #1554 from Eric89GXL/minor-fixes

FIX: Minor fixes