Fixed couple issues with runname generation