A few start up optimisations