Fix remaining simulator bugs