Fixed some analysis issues