Repaired issues generated from an odd commit.