Fixed a whole host of container bugs