Graphite Fixes