Pull in Ryan Lane's fixes to strapping