Merge pull request #128 from evansb/fix-misc
Fix miscellaneous things

(main@eea91761293c16b9073207fb85d6b83a62e09596)