Minor fixes to flash-queue