Add user and person aliases also in non-namespaced mode
Add some safeties to persitance code, because unitofwork get confused sometimes (funnily, never in unittests..)