Fixing Errors

Fixing errors during the sync