Config bug fixes

Reviewer: @jcwilk