Last couple of fixes
Fixed some more configuration files thingies