Minor enum fixes