SW-57. more corrections after removing TypeUtils