fixes for unix build