Code fix up.