Tiny graphics cleanups