Minor stylecop fixes