Minor optimisations to improve openmp scaling