Fix up headers and stuff

Change-Id: I63743726e326b1e0c7524b67f59d9be3ac56cb2e