Fix #726.
Adjusted control pref headers according to #718.