Clean build.
A few simple changes.