Minor modifications necessary to enable Graphite.