More P970 Fixes

Change-Id: Ib28f0c0edbe8f8cafe8eb1acefef9d7501769277