Missing bits

Change-Id: Id7b1bf620421e21307cdcde69ea56fd2bc0f87e8