Modified stml and dbi build to minimize need for hand tweaking build