Fix Graphics to have the same interface as in Trunk