Convert fixes

Fixing issues with the first conversion