Code review and preparation for bug fix.