Improved privilege handing.