more bug fixes for first launch users