Fixed a a few issues related to incorret imports. DONE.