Fixing issue with empty config, cross-platform tweaks.