Further fixes to the new watermark feature (especially for Windows deployment)