Build fixes

Minor build fixes.