fixes due to upstream changes