Fixed some issues in Cafedra