- more resource leakage fixes