Fixes more issues caused when rebasing