Stuff I forgot to commit on 12 Aug for #29