Fixed various bugs in DDI crosswalk.