Fixed a few crashing issues on web app tab