Fixing cp issues