A couple of preset bug fixes.