Vid 1281

follow up changes for 1281

@jsutterfield @saipetch @kenkouot