Fixed the last two commits.