Some YQueue improvements