fixup! More convertions