Fixed some analysis issues.