1. cosmetic fix of bug #1804 2. replaced some calls of surePathToTmpFile with $self->surePathToTmpFile they were for links to auxiliary files that aren't used much so no-one had noticed.
Changed paths: