Fixes to multi user setup