user-rights fixes and security improvement