Various YQueue modifications