Add some build optimisations