Few more optimisations