Fixed cp stuff

Change-Id: Id19fbe260224fb0e00d95069e3eee806f12c6c6e