ENH: fix issues