Fill in some bits that didn't make it over with git apply

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>