Fixed the last issues of asscopying before merge.