Fixed broken references after moving things around a bit