EAGLESIX-2714: minor changes