FIX: Minor fixes
Merge pull request #1450 from Eric89GXL/fix-dist

FIX: Minor fixes