Fixes for Doulble callback bug