Pie cleanup and fixes