Applying shw conversion precision fixes to master