Some graphics changes for figuring out a bug in the graphics stack