Further tweaks per #46