corrections after onegate imports checks