Adjust Base Graphics, fixes #3