Clean up problems reported by Eclipse