Fixes specs and import errors issue hopefully