Minor build fixes