Little fixes

Some fixes made with resharper