ENH Final fixes