Fixed some callback issues