Fix wrong versions for proxies not being handled correctly.
Fix fluid not being drained correctly.
Fix possible NPE. Close #338.