Some more style fixes