Bug fixes
Syncing changes