Minor follow-up fixes for #293