Bugfix/overlay memory leaks