MSI fixes

@sblom, can you sign this off?