Fix merge errors in last commit