Fix connection timing issues + Plugin version