Updated build config.
Minor changes.
Merged changes.