Make some changes to further better if a browser crashes or something