Shared user bugfixes