Correct some errors found by Eclipse validators