Some final fixes for TAP