Part 1 of changes for syncing volunteer prefs + other cleanup