Fixed cp stuff

Change-Id: I4b947b4f51edec7a9431edd2e833d90a279fd5a5