Other minor graphs fixes