More headers and some fixes

Change-Id: Ib7240a8605c53bbbe5c8df8aee43d26ee4786476