Fixes for html m to s