Proxies and a small fix for fluid machines

Specifically, making them use mappings for auto-ejection.