Fixes for a294330359b4a62247099a19ee4967d6bcc3b86d.

Things were a little off on careful inspection of the commands but the test data is not sensitive to pick that up.