Fixing some configurations