Two more compiler issues with Java 8 fixed. They could be found with
"-Xlint:deprecated".