Fix issue with missing classes + tooltip not appearing