Forced additional function enclosures and fixed callback bug