more Garbage Collector friendly changes