Fixing a few configuration issues