Re-add some more default options