fixes for o3 flags

Change-Id: Icd3edcd19c5e2a346026c3150b184733d09327f7