MOre fixes to tail()