Fixes for config changes (missed in last commit)