In anticipation of enabling more features in the default build. Also, fix compilation of minimal build.
Paul Sokolovsky