Fixed object copy problems