2014-09-21

Fix multi-user bugs.