minor build fixes