Housekeeping.
Also - fix the build.