Fixes and more security comments.