first fixes for unix build