Updating a security issue and small bug