small fixes for CFK-140