Some fixes for HTML report