EAGLESIX-3082: Corrections made in accordance with comments.