Fixed some container escape issues

Fixes #1752
Re-adds movement to escape disposals