MAINT: misc small changes