Manually fix some issues from import.