ENH a few more