Made a few minor changes as documented in #625; this should close #625