Pie: Fix and easy recalculation for Chevron and Pie

Adapted for PAC

Change-Id: I82b2434604e80493993611dbab3118c686023228