Fixed some analysis problems...