A few more security fixes