minor changes in SAOperationResolver