Made build changes for this branch.