Fix issues with merging upstream.