Watermark fixes