More work to fix issues with tanks being filled by a bucket