Water system repair