Bye bye JKaffe
Fix stuff for non-mc projects