Graphics, fixes