Fix some bugs for new users