A few more twerks for #259. See #190