diff --git a/eve_api/tasks.py b/eve_api/tasks.py
index 9fce2e3..4fe0257 100644
--- a/eve_api/tasks.py
+++ b/eve_api/tasks.py
@@ -63,6 +63,6 @@ def import_corp_members(api_userid, api_key, character_id):
 
 @task(ignore_result=True)
 def import_corp_details(corp_id):
-    corp = EVEPlayerCorporation.objects.get_or_create(id=corp_id)
+    corp, created = EVEPlayerCorporation.objects.get_or_create(id=corp_id)
     corp.query_and_update_corp()
     corp.save()
diff --git a/sso/tasks.py b/sso/tasks.py
index 1864a6a..80a9835 100644
--- a/sso/tasks.py
+++ b/sso/tasks.py
@@ -1,6 +1,5 @@
 from celery.decorators import task
 from eve_api.models import *
-from sso.models import ServiceAccount
 
 @task()
 def update_user_access(user):
@@ -61,6 +60,8 @@ def update_user_access(user):
 
 @tasks(ignore_result=True)
 def update_service_groups(user_id):
+    from sso.models import ServiceAccount
+
     for service in ServiceAccount.objects.filter(user=user_id, active=True):
         api = service.api_class
         api.update_groups(service.service_uid, service.user.groups.all())