Fixed a couple errors regarding imports