Minor fixes, style fixes