+ fix some issues with first connection