build phase fixes