Merge "Fix incorrect config option types"