Fixed some cacti stuff