Fixed broken sources after merge.