Fixes for multiuser support