More tail tweaks