Bug fixes
Changed configuration