Fix some logic classes