Three more...

Change-Id: Ic5158485e24ae6edd8d6a8e05f8a2bd7772ce294