Fixed access leaks