EAGLESIX-2715: minor code changes