Add workarounds for 3rd parties not respecting Class#name