Fixing config bugs