Fixing some bugs in component settings