QAQC speedbug fixes