Implement a couple things that had been left as stubs in the buildfile-loading code.