fix all kinds of muckups

Change-Id: I7bdf5ed770bca0a94489ba4fc1a98db810061425