Minor fixes, style changes