Fixed remaining warnings.