Fix bugs with multiple user