Some graphical fixes