Blaze fixes with some improvements.