Fixed some derps, warnings, duplicates and leftovers

Patch set 2: missed some stuff

Change-Id: I988ae8a335215b4f20953abeeb7ed4f649404843