Fixes to multi-users system