Various fixes. Moved Connection subscriptions to appropriate subclasses