Avoid memory leak; Tiny improvements