minor changes to keep the new Oracle Java 8 compiler happy