Fixed a few ownership issues.