Fixes for Blaze