Bug fixes regarding multi user system