[COOK-3694] Minor changes to attributes