More stuff in the whitelist

Change-Id: Ia3aadd0ecd6a647bf9a49c9e9ad6fb4de2edcc6c