Pull Request - Network Message Queue Bugfixes