Fixed some configuration issues