Fixed some minor message queue issues

fixes #330