more issues with optimisation commits.