Fixing unix build errors