Changes to support some semblence of security.