Minor code clean up.
Updated builds.