[convcao] Bugs detected and fixed for first water tests.