Fixed a couple things for weird cases