Fix build error, reorganize PIE control, which is based off Vanir