- Fix connection-related annotations