Made changes to fix the eclipse warning messages.