Habanero changes for alternate qps measurement