* Some security fixes