small build fixes