GH: Fixes I guess