bugfixes added policies and perfcounters

Change-Id: Ie08b0668b5794f710e56d74ed95d3cd43355f2be