Unix build fixes