Minor fixes.
Fix build.