Fixed all of the bugs introduced by the 2.0 update.