Minor fixes, formatting.