Added missing stuff

Change-Id: I9075e895c2892f743c8976a1a62a8be01dd6230c