All the various fix ups needed yet to remove msim

Signed-off-by: baked <travp624@gmail.com>