Merge "Fix warnings in config-util"