ENH: misc fixes