Fix issues introduced when rebasing
1 file changed