add missing imports
fix comparison of Proxy objects