fixes for new cadolib