Fixed a few conversion bugs