Fixing some bugs in configuration