Fixed a few issues with cans

Fixes issue #5614, in addition to addressing the unreported issue of being able to pour liquids from/into a closed container.

This can go right into master because it's just bugfixes, yeah?