EAGLESIX-2651: Set*: fix trivial issues