Minor tweaks to satisfy @rossbruniges