Got there in the end.  Took a bit of extra paintwork and a flood test.