Bugfixes and tweaks to abstract containers and objects.