Random very minors fixes.
Merge pull request #2104 from aRn0D/config/minor_fixes

Random very minors fixes.