Hendrik Leppkes:
	- Fix a few leaked globals
