Fix even more changes

Change-Id: If01d409b7ac0c55e509748508c7fea17d0f5b228