Add fixes related to merging versions.