GameObject fixes