fixing dependencies and imports, come on travis