Fix issues after merge