Some changes added to compile and run with Java 6 and Java 7.

* correction of errors with Javac 6;
- fields accessibility of generic class.

Change-Id: I057e4c169a3934a1a2e1a32060719884884cc952