Some random fixes for imports