executor fixes, handle no-callback case