some fixes for watermark_pos