MAINT: small misc changes