Minor fixes, still buggy in findContainer