enable mangling and fix missing annotations