Some lesser changes to make some special options work.

(cherry picked from commit c65b8104421597ac3152c666701bf5fcf5fa89d4)

Conflicts:
	main.pdf