More small optimisations