Fix problems detected by Eclipse