Fixed some callback stuff