Adjust watermarks and add further log messages