Changes on DisplayObject/Container

Fix some issues from previous commit.