Build changes.
Cleanup and improve server building.