Fixed remaining problems.