Previous merge conflict fixes