fixes for restructuring of TensorOperations