Slight improvements in Common.cs