Fixes for Msim