Update code to correct some issues.