fixes for blaze