re-add these options that I somehow clobbered