Minor changes to improve graph