Fixes for new HTML