Fixed issues with water shader and optimization