Manual fixes to Graphics...