Fix some more memory issues