fixes for imports of larch modules