Improvements on user privileges etc