Address and queue fixes
Queue fix