Fixed a few configuration issues