Copy improvements from @kat