More work on wrench support (#355)