Fixes for Syndic