Missed these
Merge pull request #374 from hunner/missed_unsup

Missed these