Fixes for backend sync