Fix log message.
Merge branch 'options' into custom
Fix a couple of missed changes.
Merge branch 'options' into custom