- fixes for unix build