Some lesser changes to make some special options work.