Fixes towards the changes on Settings collections