SynoDs fixes