Simplifying errors #2779
Preferences bugfix related to CC, #2699
oops, missed that.