bugfixes for lacal cf