Fix problems reported by Eclipse.