follow up fixes for #13