Bugfixes

OK, this ought to cure the Thick Tail problem and head off some others.