Further small optimisations