Minor fixes/style changes