More small speed optimisations