ENH Some small fixes