Prepare for some of the Blaze changes in 0.9.1