Fixes to users and app