Four more...

Change-Id: I653a893c019361009b6ebb18fd472e6d34d078fe