Few fixes to importing and trial to add facebook signup