A few style fixes to satisify lint