Fixed Some issues with message queue starvation