Fix bug and add conditionals for missing morea types.