record support small fixes