Fixed some callback issues.