More A-15 build optimisations