3783: some additional corrections