Fixed remaining Eclipse warnings