Fixed various config issues