Fixes to the new preset stuff...