More fixes.

Started to work on getting conversion code working.