Minor fixes in Main.cs