More fixes for gh changes