More placating of resharper hints/warnings