Some code fixing here.