Buildfixes

Minor build fixes.