simulator fixes

Change-Id: If23680657f535141df204969b1b84868b9a82c29