Bug fixes dealing with multiple users