Fixed importing RVM programs: also import types.
Merged.