Fixed remaining issues.