Code clean up as per Ufligy2 warnings.
Updated builds.