Some more optimisations