misc changes to upstream project