Fixing up other calls to current_directory which shouldn't have been there.