2.1, 2.2, 2.5: low water mark fix