More Graphical Fixes