giHelper, minor fixes