Fixed broken GAV refs