ENH: small improvements