Workaround for various incorrect type lookups in Rust

This should resolve most of the issues