Several style fixes