some more tap fixes