Add explicit options to remove warnings.

Should also cause fewer unnecessary sessions to be created