Fix first aid fields, they should be a bit smarter now.