Switch to OP only mode
Miscellaneous changes