Making advanced build actually work