Fixed wrong return type and added a bunch of EH links.