Add missing bits

Change-Id: I8ad724ac3ff614f99377616aa693b25086161e4d