Minor fixes for the API and security changes.