Fix graphs etc