Synced fixes

fixes