Pie: Fix and easy recalculation for Chevron and Pie

Change-Id: Ib069984a79c91e4c9bf62fa6a30b910c4ae4f1ad