Fix inconsistencies

Change-Id: I03708f18cd8ddf0f27301e6bb4eeb67f0f37b49f