Fixing build issues when elemental flag is not provided.