Fixed build issues after merge