Fixes to "talktalk screwed me"