ENH: Addressing some issues
ENH: Addressing some issues