update config
Fix compile errors