Better validation of watermarks