Fixed bugs in the first build of 2.0