Some fixes for kirby