I am trying to re grout natural stones on a shower floor. I had completed the job but somehow water got under the stones and into the thinset and loosened a section of stones. I removed them dried it out, and reset the stones. I haven't regrouted yet and wanted to see if anyone had suggestions on keeping it water tight. Should I caulk around drain?