Proper builds  Fix graphs