AT-37: Making the code java 6 compliant.