Fixed source analysis issues.