misc style fixes