Small simulation fixes