small fixes for patches for Kolab 3.0