Minor tweaks related to #267