fix two minor issues found while porting workloads