fix ups from @davidbgk