Some fixes to sync cparse with latest sdb