Fixing conversion bugs.