More fixes to preferences updates.