Improve basic TAP handling