Fixes from kombu dev to get example working