some more bug fixes on gc (still not all)