Fixed some oddities.