whoops, add stuff missing from 8d5565009f39f872d2e