Some usability and security fixes.