Some of these are related to the new build system that is not merged in
yet, but they are nice to go ahead and add for when I switch between
branches.