Fastmodel fixes
Created by: qais-yousef
The two commit fix issues I've seen when running on fastmodels. The common cause is duplicated timestamps which seem to happen more often on fastmodels. I think this is an artefact of the simulated time in fastmodels so probably the fixes are valid but it'd be good to have more critical eyes at this.