Minor changes to adapter/utility.