the main thing is make sure you have your mast pointed into the wind (or somewhere in that direction). we've tried to right our 20 with the bow in the wind and weren't able to do it. when my brother finally anted up and jumped in the water and swam the bow around, we were good to go
our comptip leaks a bit but we haven't had any trouble righting her in strong wind. i'm assuming the water is coming in at the connection to the metal part of the mast, and this can probably be easily fixed with some silicone.