Other graphs fixes