Fix watermark
Fix migration error