diff --git a/lib/data_conversion/import_to_mysql.rb b/lib/data_conversion/import_to_mysql.rb
index a8d62c6cf..1699cc9dd 100644
--- a/lib/data_conversion/import_to_mysql.rb
+++ b/lib/data_conversion/import_to_mysql.rb
@@ -12,7 +12,7 @@ module DataConversion
       "#{string} = NULLIF(@#{string}, '')"
     end
     def unix_time(string)
-      "#{string} = FROM_UNIXTIME(LEFT(@#{string}, LENGTH(@#{string})-3))"
+      "#{string} = FROM_UNIXTIME(@#{string} / 1000)"
     end
 
     def import_raw
@@ -73,7 +73,8 @@ module DataConversion
                mongo_aspects.updated_at,
                mongo_aspects.mongo_id,
                mongo_aspects.user_mongo_id
-          FROM mongo_aspects INNER JOIN users ON (users.mongo_id = mongo_aspects.user_mongo_id)
+          FROM mongo_aspects
+          INNER JOIN users ON (users.mongo_id = mongo_aspects.user_mongo_id)
       SQL
       log "Imported #{Aspect.count} aspects."
     end
@@ -88,7 +89,9 @@ module DataConversion
                mongo_contacts.created_at,
                mongo_contacts.updated_at,
                mongo_contacts.mongo_id
-          FROM mongo_contacts INNER JOIN (users, people) ON (users.mongo_id = mongo_contacts.user_mongo_id AND people.mongo_id = mongo_contacts.person_mongo_id)
+          FROM mongo_contacts
+          INNER JOIN (users, people) ON (users.mongo_id = mongo_contacts.user_mongo_id
+                                         AND people.mongo_id = mongo_contacts.person_mongo_id)
       SQL
       log "Imported #{Contact.count} contacts."
     end
diff --git a/spec/lib/data_conversion/import_to_mysql_spec.rb b/spec/lib/data_conversion/import_to_mysql_spec.rb
index 8b42fc1fa..aa0ca3d63 100644
--- a/spec/lib/data_conversion/import_to_mysql_spec.rb
+++ b/spec/lib/data_conversion/import_to_mysql_spec.rb
@@ -75,7 +75,7 @@ describe DataConversion::ImportToMysql do
       it "sets the relation column" do
         @migrator.process_raw_aspects
         aspect = Aspect.first
-        aspect.user_id.should == User.where(:mongo_id => aspect.user_mongo_id).first.id
+        aspect.user.should == User.where(:mongo_id => aspect.user_mongo_id).first
       end
     end
 
@@ -131,6 +131,7 @@ describe DataConversion::ImportToMysql do
 
       it "imports all the columns of a non-owned person" do
         @migrator.process_raw_people
+        mongo_person = Mongo::Person.first
         person = Person.first
         person.owner_id.should be_nil
         person.mongo_id.should == "4d2657e9cc8cb46033000002"
@@ -138,17 +139,19 @@ describe DataConversion::ImportToMysql do
         person.url.should == "http://google-10ce30d.com/"
         person.diaspora_handle.should == "bob-person-19732b3@aol.com"
         person.serialized_public_key.should_not be_nil
-        person.created_at.to_i.should == 1294358505
+        person.created_at.should == mongo_person.created_at
       end
+
       it "imports all the columns of an owned person" do
         @migrator.process_raw_people
         person = Person.where(:owner_id => User.first.id).first
-        person.mongo_id.should == "4d2657e9cc8cb46033000008"
-        person.guid.should == person.mongo_id
-        person.url.should == "http://google-4328940.com/"
-        person.diaspora_handle.should == "bob14cbf20@localhost"
-        person.serialized_public_key.should_not be_nil
-        person.created_at.to_i.should == 1294358506
+        mongo_person = Mongo::Person.where(:mongo_id => person.mongo_id).first
+        person.mongo_id.should == mongo_person.mongo_id
+        person.guid.should == mongo_person.mongo_id
+        person.url.should == mongo_person.url
+        person.diaspora_handle.should == mongo_person.diaspora_handle
+        person.serialized_public_key.should == mongo_person.serialized_public_key
+        person.created_at.should == mongo_person.created_at
       end
       it 'sets the relational column of an owned person' do
         @migrator.process_raw_people
@@ -341,8 +344,9 @@ describe DataConversion::ImportToMysql do
         post = Mongo::Post.first
         post.youtube_titles.should be_nil
         post.pending.should == false
-        post.created_at.to_i.should == 1294358525
-        post.public.should == false
+        # puts post.created_at.utc? # == true
+        post.created_at.utc.to_i.should == 1294358525 # got 1294329725 - minus 8 hours
+        post.public.should == false                   # 1294358525000 in fixture
         post.updated_at.to_i.should == 1294358525
         post.status_message_mongo_id.should be_nil
         post.caption.should be_nil