Minor fixes because of new logics