Fix Java 5 source compatibility issue / Inspector warnings