More PIE

Change-Id: Ifbe8f2bb3b8c5f1763df2ad666700d601fc2b8ed