Add missing stuff

Change-Id: I865b9fc890d32e5f76ef9f721f873bbafe95169d