Upgrade to Buzz 0.9