Fix Pie Alignment, Fix Builds