Hopefully fix the ResourceLeak stuff