more gc fixes