Fixes/cleanups from BUIDs rewrite