Solved some configuration issues