Updates from Ruf and StyleCop