Remaining fixes for SYNC-277