Fix paste error.

Also some missed files from previous update