lock fixes and queue load feature