Misc simulation fixes