More PIE fixes

Change-Id: Ib2f93db882b988c40b345e3b5621cdcc388dcaa5