MAINT: misc fixes based on comments from @jairideout