Fixed messed up build configurations