Added fixes from previous tasks (TemporaryFolder, other small fixes)