Logging cleanup
Incorrect registration of core options registrar