Fixed a couple of dangling reference bugs