More bug fixes...
Added missing connection headers