Fixes for issues exposed from the blaze tests