More bench fixes