Unbreak buildworld a slightly different way. Adjust null.h to not