#38 A couple bugfixes for container handling
Merged by jcline. Opened by jcline.