fixup some flags

Change-Id: I40676e03e2d3284ad2f0f63d8c33b44f4a94b93d