Fixed building issues after merge