Fixes for blaze