Logic fixes without fkmp TC logic