Fix various object appearance problems caused by previous commit.