Even more style fixes