Some fixes to KinDzaDza