messing with some flags

Change-Id: If971c457a82fc2be7c7bf62b115a7fb639ce8706