Fixes for html rendering