fixing several issues that broke blaze-html integration