Fix RS connected states/events usage (fixes #13)