Fixed lib interactions