Fix connections refs, self/this issues.