Fixes configure problem/XMI-MSIM plugin fixes

Hey Bruno,


We should probably talk before you merge this one in.

Best,

Tom