Fix bugs after style fixes.