Various fixes to the new preset system...