Small building fixes/tools for all!