Fixed Storage & Watermark Bugs