Build flags optimised

Change-Id: Iaf9cc238968b1e3d669eb3f2f41c1300265be36e