wrapped connection fixes