More flags for optimising

Change-Id: Icbfbd519b04376bce15f57638ec5f3dae7a5d98e