Fix issues that were missed during merge