Added missing callback to three functions