callback fixes on connection layer