Replaced the tank at lunch. Guess I'll know if it's solved the problem tomorrow morning when it cold!
Of course I dropped one of the screws down a plastic channel..
don't drop the screw, don't drop the screw, doh!!
Will have to fish it out with a magnetic pickup later.