Fix bugs in the beta app

This PR will fix a few crashed in the 2.0 beta 1 application.