Small fixes for html generation