Java 8 problem fixed (statis and default methods of interface).
Minor improvements.