Fixed some strong held references