Last fixes on doughnuts