Minor clean up
Add Connection to common headers, close #957