Fixed cp stuff

Change-Id: If4f5f997497ebcb1725503761bb08fdc19f2523c