Some fixes, cleanups in kkrcon