Finished up some changes working with .net 2.0