Fix minor code issues.