CSIT-597: spot fixes for crudini, interface differences