Small fixes
Small changes to the config handling