Some minor code changes.