A few fixes.. got Throughput test workin onsite.