Revert "Revert "Missed these""

This reverts commit dc520743fd85d4e82b644fc0ee36943a30c1705b.