Fix conversions.
Merge pull request #76 from MastodonC/feature/fix-conversions

Fix conversions.