Fixed `cp` related errors