Couple more style fixes