ENH: some fixes ...