Various style fixes