Apply watermark upon upload -- Fixes and  Rescture.