Message queue timing and one module fix