More PIE stuffs

Change-Id: I10e026e76748b1e273d38a983ea873a7076b124d