Fixed errors after import