Minor coding style fixes