Cleaned up undefined/null owner issues