Fixde katarina compile issues