duty fixes from beta