FIX Added missing callbacks to fix errors