and more gh fixes